Skip to content

Fix tolerations API placement and implementation#1552

Merged
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:mainfrom
stuggi:18693-fix
Aug 6, 2025
Merged

Fix tolerations API placement and implementation#1552
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:mainfrom
stuggi:18693-fix

Conversation

@stuggi

@stuggi stuggi commented Aug 6, 2025

Copy link
Copy Markdown
Contributor

Move tolerations from ContainerSpec to OperatorSpec level since tolerations are deployment/pod-level configuration, not container-level.

Changes:

  • Move Tolerations field from ContainerSpec to OperatorSpec in API types
  • Update override logic to use correct field path (opOvr.Tolerations)
  • Fix test cases to use OperatorSpec.Tolerations instead of ControllerManager.Tolerations
  • Fix YAML indentation in sample configuration

This corrects the API design to follow Kubernetes conventions where tolerations are specified at the pod template level, not per container.

Jira: OSPRH-18693

Move tolerations from ContainerSpec to OperatorSpec level since
tolerations are deployment/pod-level configuration, not container-level.

Changes:
- Move Tolerations field from ContainerSpec to OperatorSpec in API types
- Update override logic to use correct field path (opOvr.Tolerations)
- Fix test cases to use OperatorSpec.Tolerations instead of ControllerManager.Tolerations
- Fix YAML indentation in sample configuration

This corrects the API design to follow Kubernetes conventions where
tolerations are specified at the pod template level, not per container.

Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
@stuggi stuggi requested a review from abays August 6, 2025 06:15
@openshift-ci openshift-ci Bot requested review from fultonj and lewisdenny August 6, 2025 06:15
@openshift-ci openshift-ci Bot added the approved label Aug 6, 2025
@stuggi stuggi removed request for fultonj and lewisdenny August 6, 2025 06:21

@abays abays left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label Aug 6, 2025
@openshift-ci

openshift-ci Bot commented Aug 6, 2025

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abays, stuggi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@stuggi

stuggi commented Aug 6, 2025

Copy link
Copy Markdown
Contributor Author

/override ci/prow/precommit-check

@openshift-ci

openshift-ci Bot commented Aug 6, 2025

Copy link
Copy Markdown
Contributor

@stuggi: Overrode contexts on behalf of stuggi: ci/prow/precommit-check

Details

In response to this:

/override ci/prow/precommit-check

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-merge-bot openshift-merge-bot Bot merged commit 93d695e into openstack-k8s-operators:main Aug 6, 2025
10 checks passed
@stuggi

stuggi commented Aug 6, 2025

Copy link
Copy Markdown
Contributor Author

/cherry-pick 18.0-fr3

@openshift-cherrypick-robot

Copy link
Copy Markdown

@stuggi: new pull request created: #1553

Details

In response to this:

/cherry-pick 18.0-fr3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants